<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-11 14:17:49 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>Git - gitworkflows</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Guides">
                                Guides                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="166122511f291e582b8b14f6c750ac30805635bb32dd489e7e5ca5cbfd59bdd9/ae" data-source="gitworkflows" onmousemove="i18n(this)">gitworkflows</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="d5d41f3d499f2df0180c40976b53fdce85b22022486feee44c1b153e27a0461f/a1" data-source="gitworkflows - An overview of recommended workflows with Git" onmousemove="i18n(this)">gitworkflows &mdash; &ocy;&bcy;&zcy;&ocy;&rcy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&mcy;&ycy;&khcy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&khcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&ocy;&vcy; &scy;  Git .</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-undefined">git *</pre> </div> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="5a1d7a0808e5ce1c1a2f419ad43b8e5199c930a7249eb48dc8297a4142c1b86f/41" data-source="This document attempts to write down and motivate some of the workflow elements used for &lt;code&gt;git.git&lt;/code&gt; itself. Many ideas apply in general, though the full workflow is rarely required for smaller projects with fewer people involved." onmousemove="i18n(this)">&Vcy; &ecy;&tcy;&ocy;&mcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&iecy; &pcy;&rcy;&iecy;&dcy;&pcy;&rcy;&icy;&ncy;&yacy;&tcy;&acy; &pcy;&ocy;&pcy;&ycy;&tcy;&kcy;&acy; &ocy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &icy; &mcy;&ocy;&tcy;&icy;&vcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ecy;&lcy;&iecy;&mcy;&iecy;&ncy;&tcy;&ycy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&acy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&mcy;&ycy;&iecy; &dcy;&lcy;&yacy; &scy;&acy;&mcy;&ocy;&gcy;&ocy;  <code>git.git</code> . &Mcy;&ncy;&ocy;&gcy;&icy;&iecy; &icy;&dcy;&iecy;&icy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&mcy;&ycy; &vcy; &tscy;&iecy;&lcy;&ocy;&mcy;, &khcy;&ocy;&tcy;&yacy; &pcy;&ocy;&lcy;&ncy;&ycy;&jcy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &rcy;&iecy;&dcy;&kcy;&ocy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ncy;&iecy;&bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&ocy;&vcy; &scy; &mcy;&iecy;&ncy;&softcy;&shcy;&icy;&mcy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ocy;&mcy; &zcy;&acy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &lcy;&yucy;&dcy;&iecy;&jcy;.</span></p> <p><span data-i18n="5faae9a584f18fdcc5dbf05d9cec8bd6a9748bf264047a523516512f6c4c95e1/f7" data-source="We formulate a set of &lt;code&gt;rules&lt;/code&gt; for quick reference, while the prose tries to motivate each of them. Do not always take them literally; you should value good reasons for your actions higher than manpages such as this one." onmousemove="i18n(this)">&Scy;&fcy;&ocy;&rcy;&mcy;&ucy;&lcy;&icy;&rcy;&ucy;&iecy;&mcy; &ncy;&acy;&bcy;&ocy;&rcy;  <code>rules</code>  &dcy;&lcy;&yacy; &bcy;&ycy;&scy;&tcy;&rcy;&ocy;&gcy;&ocy; &ocy;&zcy;&ncy;&acy;&kcy;&ocy;&mcy;&lcy;&iecy;&ncy;&icy;&yacy;, &acy; &pcy;&rcy;&ocy;&zcy;&acy; &pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &mcy;&ocy;&tcy;&icy;&vcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &icy;&zcy; &ncy;&icy;&khcy;. &Ncy;&iecy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &vcy;&ocy;&scy;&pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&jcy;&tcy;&iecy; &icy;&khcy; &bcy;&ucy;&kcy;&vcy;&acy;&lcy;&softcy;&ncy;&ocy;; &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &tscy;&iecy;&ncy;&icy;&tcy;&softcy; &vcy;&iecy;&scy;&kcy;&icy;&iecy; &pcy;&rcy;&icy;&chcy;&icy;&ncy;&ycy; &dcy;&lcy;&yacy; &scy;&vcy;&ocy;&icy;&khcy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&jcy; &vcy;&ycy;&shcy;&iecy;, &chcy;&iecy;&mcy; &tcy;&acy;&kcy;&icy;&iecy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy;&ycy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy;, &kcy;&acy;&kcy; &ecy;&tcy;&acy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_separate_changes"><span data-i18n="a7f3b42ebc1f132b0b933076006b54a48c5e5ede2eb4fdf9b59ea71cd88ef5ad/bb" data-source="Separate changes" onmousemove="i18n(this)">Separate changes</span></h2> <div> <p><span data-i18n="193d8a705f2c1ea08db2716593846616f17d92bc47cc02af4e9ce574fbc7dbb6/fc" data-source="As a general rule, you should try to split your changes into small logical steps, and commit each of them. They should be consistent, working independently of any later commits, pass the test suite, etc. This makes the review process much easier, and the history much more useful for later inspection and analysis, for example with &lt;a href=&quot;git-blame&quot;&gt;git-blame[1]&lt;/a&gt; and &lt;a href=&quot;git-bisect&quot;&gt;git-bisect[1]&lt;/a&gt;." onmousemove="i18n(this)">&Kcy;&acy;&kcy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;, &vcy;&acy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&tcy;&softcy;&scy;&yacy; &rcy;&acy;&zcy;&bcy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &ncy;&acy; &ncy;&iecy;&bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &lcy;&ocy;&gcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&iecy; &shcy;&acy;&gcy;&icy; &icy; &zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &icy;&zcy; &ncy;&icy;&khcy;. &Ocy;&ncy;&icy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy;&icy;, &rcy;&acy;&bcy;&ocy;&tcy;&acy;&tcy;&softcy; &ncy;&iecy;&zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy; &ocy;&tcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;, &pcy;&rcy;&ocy;&khcy;&ocy;&dcy;&icy;&tcy;&softcy; &ncy;&acy;&bcy;&ocy;&rcy; &tcy;&iecy;&scy;&tcy;&ocy;&vcy; &icy; &tcy;. &dcy;. &Ecy;&tcy;&ocy; &zcy;&ncy;&acy;&chcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ucy;&pcy;&rcy;&ocy;&shchcy;&acy;&iecy;&tcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy;, &acy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy; &mdash; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ocy;&jcy; &dcy;&lcy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy; &icy; &acy;&ncy;&acy;&lcy;&icy;&zcy;&acy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &scy;  <a href="git-blame.html">git-blame[1]</a>  &icy;  <a href="git-bisect.html">git-bisect[1]</a> .</span></p> <p><span data-i18n="b7225b57f019f6e838abbda4ba106f965e68e00bcd88dc339ae6ca9b71e25528/be" data-source="To achieve this, try to split your work into small steps from the very beginning. It is always easier to squash a few commits together than to split one big commit into several. Don&amp;rsquo;t be afraid of making too small or imperfect steps along the way. You can always go back later and edit the commits with &lt;code&gt;git rebase --interactive&lt;/code&gt; before you publish them. You can use &lt;code&gt;git stash push --keep-index&lt;/code&gt; to run the test suite independent of other uncommitted changes; see the EXAMPLES section of &lt;a href=&quot;git-stash&quot;&gt;git-stash[1]&lt;/a&gt;." onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &dcy;&ocy;&bcy;&icy;&tcy;&softcy;&scy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy;, &pcy;&ocy;&pcy;&rcy;&ocy;&bcy;&ucy;&jcy;&tcy;&iecy; &scy; &scy;&acy;&mcy;&ocy;&gcy;&ocy; &ncy;&acy;&chcy;&acy;&lcy;&acy; &rcy;&acy;&zcy;&bcy;&icy;&tcy;&softcy; &scy;&vcy;&ocy;&yucy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &ncy;&acy; &mcy;&acy;&lcy;&iecy;&ncy;&softcy;&kcy;&icy;&iecy; &shcy;&acy;&gcy;&icy;. &Vcy;&scy;&iecy;&gcy;&dcy;&acy; &lcy;&iecy;&gcy;&chcy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;, &chcy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &ocy;&dcy;&icy;&ncy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&jcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &ncy;&acy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy;. &Ncy;&iecy; &bcy;&ocy;&jcy;&tcy;&iecy;&scy;&softcy; &dcy;&iecy;&lcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&shcy;&kcy;&ocy;&mcy; &mcy;&acy;&lcy;&iecy;&ncy;&softcy;&kcy;&icy;&iecy; &icy;&lcy;&icy; &ncy;&iecy;&scy;&ocy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&ncy;&ycy;&iecy; &shcy;&acy;&gcy;&icy; &ncy;&acy; &ecy;&tcy;&ocy;&mcy; &pcy;&ucy;&tcy;&icy;. &Vcy;&ycy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &vcy;&iecy;&rcy;&ncy;&ucy;&tcy;&softcy;&scy;&yacy; &pcy;&ocy;&zcy;&zhcy;&iecy; &icy; &ocy;&tcy;&rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>git rebase --interactive</code> , &pcy;&rcy;&iecy;&zhcy;&dcy;&iecy; &chcy;&iecy;&mcy; &pcy;&ucy;&bcy;&lcy;&icy;&kcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&khcy;. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>git stash push --keep-index</code>  &dcy;&lcy;&yacy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &ncy;&acy;&bcy;&ocy;&rcy;&acy; &tcy;&iecy;&scy;&tcy;&ocy;&vcy; &ncy;&iecy;&zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy; &ocy;&tcy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &ncy;&iecy;&zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;; &scy;&mcy;. &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &Pcy;&Rcy;&Icy;&Mcy;&IEcy;&Rcy;&Ycy;  <a href="git-stash.html">git-stash[1]</a> .</span></p> </div> <h2 class="text-body-emphasis"  id="_managing_branches"><span data-i18n="ea0d4ae9b62abd83b24ee3beffdf457078cb8d33651df24d44f6d21ef2081622/fe" data-source="Managing branches" onmousemove="i18n(this)">Managing branches</span></h2> <div> <p><span data-i18n="d9c70f8a370e0e7fc0af04a23dbd9e33efaafb6a2c1767ffa8ff532974315207/dc" data-source="There are two main tools that can be used to include changes from one branch on another: &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt; and &lt;a href=&quot;git-cherry-pick&quot;&gt;git-cherry-pick[1]&lt;/a&gt;." onmousemove="i18n(this)">&Scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &dcy;&vcy;&acy; &ocy;&scy;&ncy;&ocy;&vcy;&ncy;&ycy;&khcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &icy;&zcy; &ocy;&dcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy;:  <a href="git-merge.html">git-merge[1]</a>  &icy;  <a href="git-cherry-pick.html">git-cherry-pick[1]</a> .</span></p> <p><span data-i18n="28cab64e8ae4f9968ec7404c0d78757b1b209d7a4c4ce05323a7c6ae11c35e82/c3" data-source="Merges have many advantages, so we try to solve as many problems as possible with merges alone. Cherry-picking is still occasionally useful; see &amp;quot;Merging upwards&amp;quot; below for an example." onmousemove="i18n(this)">&Scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&mcy;&iecy;&yucy;&tcy; &mcy;&ncy;&ocy;&gcy;&ocy; &pcy;&rcy;&iecy;&icy;&mcy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &mcy;&ycy; &scy;&tcy;&acy;&rcy;&acy;&iecy;&mcy;&scy;&yacy; &rcy;&iecy;&shcy;&icy;&tcy;&softcy; &kcy;&acy;&kcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&dcy;&ncy;&icy;&khcy; &lcy;&icy;&shcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;. &Scy;&bcy;&ocy;&rcy; &vcy;&icy;&shcy;&iecy;&ncy; &vcy;&scy;&iecy; &iecy;&shchcy;&iecy; &icy;&ncy;&ocy;&gcy;&dcy;&acy; &bcy;&ycy;&vcy;&acy;&iecy;&tcy; &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy;; &scy;&mcy;. &pcy;&rcy;&icy;&mcy;&iecy;&rcy;  &quot;Merging upwards&quot;  &ncy;&icy;&zhcy;&iecy;.</span></p> <p><span data-i18n="b32c70a966ae496b2c0b9c4a0d911f33113493dc7d80d1713fad37b32f90aebd/29" data-source="Most importantly, merging works at the branch level, while cherry-picking works at the commit level. This means that a merge can carry over the changes from 1, 10, or 1000 commits with equal ease, which in turn means the workflow scales much better to a large number of contributors (and contributions). Merges are also easier to understand because a merge commit is a &amp;quot;promise&amp;quot; that all changes from all its parents are now included." onmousemove="i18n(this)">&Scy;&acy;&mcy;&ocy;&iecy; &gcy;&lcy;&acy;&vcy;&ncy;&ocy;&iecy;, &chcy;&tcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy; &ncy;&acy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy;, &acy; &vcy;&ycy;&bcy;&ocy;&rcy;&kcy;&acy; &mdash; &ncy;&acy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;. &Ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &scy; &ocy;&dcy;&icy;&ncy;&acy;&kcy;&ocy;&vcy;&ocy;&jcy; &lcy;&iecy;&gcy;&kcy;&ocy;&scy;&tcy;&softcy;&yucy; &pcy;&iecy;&rcy;&iecy;&ncy;&iecy;&scy;&tcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; 1, 10 &icy;&lcy;&icy; 1000 &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;, &chcy;&tcy;&ocy;, &vcy; &scy;&vcy;&ocy;&yucy; &ocy;&chcy;&iecy;&rcy;&iecy;&dcy;&softcy;, &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &ncy;&acy;&mcy;&ncy;&ocy;&gcy;&ocy; &lcy;&ucy;&chcy;&shcy;&iecy; &mcy;&acy;&scy;&shcy;&tcy;&acy;&bcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&gcy;&ocy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&acy; &ucy;&chcy;&acy;&scy;&tcy;&ncy;&icy;&kcy;&ocy;&vcy; (&icy; &ucy;&chcy;&acy;&scy;&tcy;&ncy;&icy;&kcy;&ocy;&vcy;). &Scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &tcy;&acy;&kcy;&zhcy;&iecy; &lcy;&iecy;&gcy;&chcy;&iecy; &pcy;&ocy;&ncy;&yacy;&tcy;&softcy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy;  &quot;promise&quot; , &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ycy; &vcy;&scy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy;&scy;&iecy;&khcy; &iecy;&gcy;&ocy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&khcy; &ecy;&lcy;&iecy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy;.</span></p> <p><span data-i18n="db6c849b29d4f2134037d318a6201ac58050a27814b81a4dfb34cb911b954863/ff" data-source="There is a tradeoff of course: merges require a more careful branch management. The following subsections discuss the important points." onmousemove="i18n(this)">&Kcy;&ocy;&ncy;&iecy;&chcy;&ncy;&ocy;, &iecy;&scy;&tcy;&softcy; &kcy;&ocy;&mcy;&pcy;&rcy;&ocy;&mcy;&icy;&scy;&scy;: &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &tcy;&rcy;&iecy;&bcy;&ucy;&yucy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &tcy;&shchcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy;. &Vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&khcy; &pcy;&ocy;&dcy;&rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy;&khcy; &ocy;&bcy;&scy;&ucy;&zhcy;&dcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy;&acy;&zhcy;&ncy;&ycy;&iecy; &mcy;&ocy;&mcy;&iecy;&ncy;&tcy;&ycy;.</span></p> <div> <h3 class="text-body-emphasis"  id="_graduation"><span data-i18n="9efe2b4d3d004cb3c7a2f8c3b80a21a60248ccfd60d756bf14a7dd1742b64dce/2a" data-source="Graduation" onmousemove="i18n(this)">Graduation</span></h3> <p><span data-i18n="98d046826fa2e3ffd7d13ed0f71e9d4b34d60ead8b17e9f178964f5529fa064f/60" data-source="As a given feature goes from experimental to stable, it also &amp;quot;graduates&amp;quot; between the corresponding branches of the software. &lt;code&gt;git.git&lt;/code&gt; uses the following &lt;code&gt;integration branches&lt;/code&gt;:" onmousemove="i18n(this)">&Pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &dcy;&acy;&ncy;&ncy;&acy;&yacy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&khcy;&ocy;&dcy;&icy;&tcy; &icy;&zcy; &ecy;&kcy;&scy;&pcy;&iecy;&rcy;&icy;&mcy;&iecy;&ncy;&tcy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &vcy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ucy;&yucy;, &ocy;&ncy;&acy; &tcy;&acy;&kcy;&zhcy;&iecy;  &quot;graduates&quot;  &mcy;&iecy;&zhcy;&dcy;&ucy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ncy;&ocy;&gcy;&ocy; &ocy;&bcy;&iecy;&scy;&pcy;&iecy;&chcy;&iecy;&ncy;&icy;&yacy;.  <code>git.git</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy;  <code>integration branches</code> :</span></p> <div> <ul> <li> <p><span data-i18n="9fbc43f6313d76906c85fec021d54e9c9f912053b98afc03bfef8dbcb9e57145/83" data-source="&lt;code&gt;maint&lt;/code&gt; tracks the commits that should go into the next &amp;quot;maintenance release&amp;quot;, i.e., update of the last released stable version;" onmousemove="i18n(this)"><code>maint</code>  &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &vcy;&ocy;&jcy;&tcy;&icy; &vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy;  &quot;maintenance release&quot; , &tcy;. &iecy;. &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&iecy;&jcy; &vcy;&ycy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;;</span></p> </li> <li> <p><span data-i18n="b32323ed0576e1cd25f2f96d79163c02a3d8a78cefa25bc3cef052e7d9ffea51/dd" data-source="&lt;code&gt;master&lt;/code&gt; tracks the commits that should go into the next release;" onmousemove="i18n(this)"><code>master</code>  &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &vcy;&ocy;&jcy;&tcy;&icy; &vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;;</span></p> </li> <li> <p><span data-i18n="226c51b3f63b75808158a53e648fa823444ad84f5e39727b64a0f128b51da20e/51" data-source="&lt;code&gt;next&lt;/code&gt; is intended as a testing branch for topics being tested for stability for master." onmousemove="i18n(this)"><code>next</code>  &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy; &kcy;&acy;&kcy; &vcy;&iecy;&tcy;&kcy;&acy; &tcy;&iecy;&scy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &tcy;&iecy;&mcy;, &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&mcy;&ycy;&khcy; &ncy;&acy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&softcy; &dcy;&lcy;&yacy; &mcy;&acy;&scy;&tcy;&iecy;&rcy;&acy;.</span></p> </li> </ul> </div> <p><span data-i18n="52a843977ddad8b0b351b2a60a6066c8b0367b63d699a4863462ffc368d75ad2/ca" data-source="There is a fourth official branch that is used slightly differently:" onmousemove="i18n(this)">&Scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &chcy;&iecy;&tcy;&vcy;&iecy;&rcy;&tcy;&acy;&yacy; &ocy;&fcy;&icy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&acy;&yacy; &vcy;&iecy;&tcy;&kcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&mcy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&acy;&chcy;&iecy;:</span></p> <div> <ul> <li> <p><span data-i18n="8cf84c4a93762d99d641fe4b2df4f94c3e59441e50948ef3dba7f6ba9c1f6352/3f" data-source="&lt;code&gt;seen&lt;/code&gt; (patches seen by the maintainer) is an integration branch for things that are not quite ready for inclusion yet (see &amp;quot;Integration Branches&amp;quot; below)." onmousemove="i18n(this)"><code>seen</code>  (&icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &vcy;&icy;&dcy;&icy;&mcy;&ycy;&iecy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&iecy;&mcy;&ucy;) &mdash; &ecy;&tcy;&ocy; &vcy;&iecy;&tcy;&vcy;&softcy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy; &dcy;&lcy;&yacy; &vcy;&iecy;&shchcy;&iecy;&jcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &iecy;&shchcy;&iecy; &ncy;&iecy; &scy;&ocy;&vcy;&scy;&iecy;&mcy; &gcy;&ocy;&tcy;&ocy;&vcy;&ycy; &kcy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yucy; (&scy;&mcy;.  &quot;Integration Branches&quot;  &ncy;&icy;&zhcy;&iecy;).</span></p> </li> </ul> </div> <p><span data-i18n="663f487891aa2759748ec06f6dd778cfdb4f53d0cbb5f70d08e94a2b29fc6ba0/27" data-source="Each of the four branches is usually a direct descendant of the one above it." onmousemove="i18n(this)">&Kcy;&acy;&zhcy;&dcy;&acy;&yacy; &icy;&zcy; &chcy;&iecy;&tcy;&ycy;&rcy;&iecy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&yacy;&mcy;&ycy;&mcy; &pcy;&ocy;&tcy;&ocy;&mcy;&kcy;&ocy;&mcy; &tcy;&ocy;&jcy;, &chcy;&tcy;&ocy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &ncy;&acy;&dcy; &ncy;&iecy;&jcy;.</span></p> <p><span data-i18n="1404a8947453fe39bddfc7e2f62f3057a3f794ba755430654f3962112e6d2eff/31" data-source="Conceptually, the feature enters at an unstable branch (usually &lt;code&gt;next&lt;/code&gt; or &lt;code&gt;seen&lt;/code&gt;), and &amp;quot;graduates&amp;quot; to &lt;code&gt;master&lt;/code&gt; for the next release once it is considered stable enough." onmousemove="i18n(this)">&Kcy;&ocy;&ncy;&tscy;&iecy;&pcy;&tcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy; &ecy;&tcy;&acy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yacy; &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy; &ncy;&iecy;&scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy; (&ocy;&bcy;&ycy;&chcy;&ncy;&ocy;  <code>next</code>  &icy;&lcy;&icy;  <code>seen</code> ) &icy; &scy;  &quot;graduates&quot;  &pcy;&ocy;  <code>master</code>  &dcy;&lcy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;, &kcy;&acy;&kcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ocy;&ncy; &bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&rcy;&icy;&zcy;&ncy;&acy;&ncy; &dcy;&ocy;&scy;&tcy;&acy;&tcy;&ocy;&chcy;&ncy;&ocy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ycy;&mcy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_merging_upwards"><span data-i18n="b33418dfe9f1ae56f9715265370faad829678e1f6ee4969572c797306c07bf57/6f" data-source="Merging upwards" onmousemove="i18n(this)">Merging upwards</span></h3> <p><span data-i18n="bcda801e4406d492f67b486cda281b69296b22ebb8990605bf315cf4ec46c7e8/17" data-source="The &amp;quot;downwards graduation&amp;quot; discussed above cannot be done by actually merging downwards, however, since that would merge &lt;code&gt;all&lt;/code&gt; changes on the unstable branch into the stable one. Hence the following:" onmousemove="i18n(this)">&Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy;&ycy;&shcy;&iecy;  &quot;downwards graduation&quot;  &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &rcy;&iecy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy; &pcy;&ucy;&tcy;&iecy;&mcy; &fcy;&acy;&kcy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ncy;&icy;&zcy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &ecy;&tcy;&ocy; &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&tcy; &kcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yucy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;  <code>all</code>  &vcy; &ncy;&iecy;&scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy; &scy;&ocy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;&jcy;. &Ocy;&tcy;&scy;&yucy;&dcy;&acy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&iecy;:</span></p> <div> <div><span data-i18n="ae7db3774256b72efdb6dd8379f88b2fcf09d544777194dbe5bf049b65d6390f/1b" data-source="Rule: Merge upwards" onmousemove="i18n(this)">&Pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;: &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &vcy;&vcy;&iecy;&rcy;&khcy;</span></div> <div> <p><span data-i18n="f8a6b48f973a3f2a7cd8877f41e30ed7fa165e041ec464b3111b976c2b2ca61d/90" data-source="Always commit your fixes to the oldest supported branch that requires them. Then (periodically) merge the integration branches upwards into each other." onmousemove="i18n(this)">&Vcy;&scy;&iecy;&gcy;&dcy;&acy; &vcy;&ncy;&ocy;&scy;&icy;&tcy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &vcy; &scy;&acy;&mcy;&ucy;&yucy; &scy;&tcy;&acy;&rcy;&ucy;&yucy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&mcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &icy;&khcy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;. &Zcy;&acy;&tcy;&iecy;&mcy; (&pcy;&iecy;&rcy;&icy;&ocy;&dcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;) &scy;&lcy;&icy;&vcy;&acy;&jcy;&tcy;&iecy; &vcy;&iecy;&tcy;&vcy;&icy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy; &vcy;&vcy;&iecy;&rcy;&khcy; &dcy;&rcy;&ucy;&gcy; &scy; &dcy;&rcy;&ucy;&gcy;&ocy;&mcy;.</span></p> </div> </div> <p><span data-i18n="1eb70642a19755aa783fe66f630b1e3a7154fcf798419fe03dd3be482307b065/3b" data-source="This gives a very controlled flow of fixes. If you notice that you have applied a fix to e.g. &lt;code&gt;master&lt;/code&gt; that is also required in &lt;code&gt;maint&lt;/code&gt;, you will need to cherry-pick it (using &lt;a href=&quot;git-cherry-pick&quot;&gt;git-cherry-pick[1]&lt;/a&gt;) downwards. This will happen a few times and is nothing to worry about unless you do it very frequently." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &ocy;&bcy;&iecy;&scy;&pcy;&iecy;&chcy;&icy;&vcy;&acy;&iecy;&tcy; &ocy;&chcy;&iecy;&ncy;&softcy; &kcy;&ocy;&ncy;&tcy;&rcy;&ocy;&lcy;&icy;&rcy;&ucy;&iecy;&mcy;&ycy;&jcy; &pcy;&ocy;&tcy;&ocy;&kcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&jcy;. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &zcy;&acy;&mcy;&iecy;&tcy;&icy;&lcy;&icy;, &chcy;&tcy;&ocy; &vcy;&ycy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&lcy;&icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &kcy;  <code>master</code> , &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &tcy;&acy;&kcy;&zhcy;&iecy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy;  <code>maint</code> , &vcy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&bcy;&rcy;&acy;&tcy;&softcy; &iecy;&gcy;&ocy; (&scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <a href="git-cherry-pick.html">git-cherry-pick[1]</a> ) &vcy;&ncy;&icy;&zcy;. &Ecy;&tcy;&ocy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&jcy;&dcy;&iecy;&tcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &rcy;&acy;&zcy;, &icy; &ncy;&iecy; &ocy; &chcy;&iecy;&mcy; &bcy;&iecy;&scy;&pcy;&ocy;&kcy;&ocy;&icy;&tcy;&softcy;&scy;&yacy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&iecy;&tcy;&iecy; &ecy;&tcy;&ocy; &ocy;&chcy;&iecy;&ncy;&softcy; &chcy;&acy;&scy;&tcy;&ocy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_topic_branches"><span data-i18n="df04292addd0757780fcd15410b49a0b4d9a4649c090c6a9659861b66db35061/25" data-source="Topic branches" onmousemove="i18n(this)">Topic branches</span></h3> <p><span data-i18n="072e8a40efef83d4ca017fabd71f9cdd51a7346318be4a8ee951a06b838277c0/80" data-source="Any nontrivial feature will require several patches to implement, and may get extra bugfixes or improvements during its lifetime." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &rcy;&iecy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&icy; &lcy;&yucy;&bcy;&ocy;&jcy; &ncy;&iecy;&tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy; &pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&jcy;, &icy; &vcy; &tcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &iecy;&iecy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ycy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &icy;&lcy;&icy; &ucy;&lcy;&ucy;&chcy;&shcy;&iecy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="1a026a82362e5832b7de02c1131661aa25b3e87c66b74ee4b4db8aea5f406a25/b4" data-source="Committing everything directly on the integration branches leads to many problems: Bad commits cannot be undone, so they must be reverted one by one, which creates confusing histories and further error potential when you forget to revert part of a group of changes. Working in parallel mixes up the changes, creating further confusion." onmousemove="i18n(this)">&Kcy;&ocy;&mcy;&mcy;&icy;&tcy; &vcy;&scy;&iecy;&gcy;&ocy; &ncy;&iecy;&pcy;&ocy;&scy;&rcy;&iecy;&dcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy; &vcy; &vcy;&iecy;&tcy;&kcy;&acy;&khcy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy;&ocy; &mcy;&ncy;&ocy;&gcy;&icy;&mcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&acy;&mcy;: &ncy;&iecy;&pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ycy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &icy;&khcy; &pcy;&rcy;&icy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &ocy;&tcy;&kcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &ocy;&dcy;&icy;&ncy; &zcy;&acy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy;, &chcy;&tcy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy; &zcy;&acy;&pcy;&ucy;&tcy;&acy;&ncy;&ncy;&ucy;&yucy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy; &icy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &vcy;&iecy;&rcy;&ocy;&yacy;&tcy;&ncy;&ocy;&scy;&tcy;&softcy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &zcy;&acy;&bcy;&ycy;&vcy;&acy;&iecy;&tcy;&iecy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &chcy;&acy;&scy;&tcy;&softcy; &gcy;&rcy;&ucy;&pcy;&pcy;&ycy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;. &Pcy;&acy;&rcy;&acy;&lcy;&lcy;&iecy;&lcy;&softcy;&ncy;&acy;&yacy; &rcy;&acy;&bcy;&ocy;&tcy;&acy; &scy;&mcy;&iecy;&shcy;&icy;&vcy;&acy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&yacy; &iecy;&shchcy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&ucy;&yucy; &pcy;&ucy;&tcy;&acy;&ncy;&icy;&tscy;&ucy;.</span></p> <p><span data-i18n="9671bb818fcd2454fec83db426326ed196a9fac5be7f4b457408d1bac4ddaf1a/5c" data-source="Use of &amp;quot;topic branches&amp;quot; solves these problems. The name is pretty self explanatory, with a caveat that comes from the &amp;quot;merge upwards&amp;quot; rule above:" onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;  &quot;topic branches&quot;  &rcy;&iecy;&shcy;&acy;&iecy;&tcy; &ecy;&tcy;&icy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&ycy;. &Ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&iecy; &gcy;&ocy;&vcy;&ocy;&rcy;&icy;&tcy; &scy;&acy;&mcy;&ocy; &zcy;&acy; &scy;&iecy;&bcy;&yacy;, &scy; &ocy;&gcy;&ocy;&vcy;&ocy;&rcy;&kcy;&ocy;&jcy;, &vcy;&ycy;&tcy;&iecy;&kcy;&acy;&yucy;&shchcy;&iecy;&jcy; &icy;&zcy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&acy;  &quot;merge upwards&quot; , &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &vcy;&ycy;&shcy;&iecy;:</span></p> <div> <div><span data-i18n="059bb12350747056caa7b318b1509461a462fe7e16739704423b6b7158d14299/ca" data-source="Rule: Topic branches" onmousemove="i18n(this)">&Pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;: &Tcy;&iecy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy;</span></div> <div> <p><span data-i18n="1a55866bbb5571b7895a70552309e068233830c9c28acb2e17e41106e0a717fd/ca" data-source="Make a side branch for every topic (feature, bugfix, &amp;hellip;&amp;ZeroWidthSpace;). Fork it off at the oldest integration branch that you will eventually want to merge it into." onmousemove="i18n(this)">&Scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &bcy;&ocy;&kcy;&ocy;&vcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&jcy; &tcy;&iecy;&mcy;&ycy; (&fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yacy;, &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &icy; &tcy;. &dcy;.). &Rcy;&acy;&zcy;&vcy;&iecy;&tcy;&vcy;&icy;&tcy;&iecy; &iecy;&gcy;&ocy; &ncy;&acy; &scy;&acy;&mcy;&ocy;&jcy; &scy;&tcy;&acy;&rcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &scy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &vcy;&ycy; &vcy; &kcy;&ocy;&ncy;&iecy;&chcy;&ncy;&ocy;&mcy; &icy;&tcy;&ocy;&gcy;&iecy; &zcy;&acy;&khcy;&ocy;&tcy;&icy;&tcy;&iecy; &iecy;&gcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy;.</span></p> </div> </div> <p><span data-i18n="365dab4c4f2bed8f6d1ac5f2ede6bc79437dcf8ae27d23cfb672b5da7176a642/b8" data-source="Many things can then be done very naturally:" onmousemove="i18n(this)">&Tcy;&ocy;&gcy;&dcy;&acy; &mcy;&ncy;&ocy;&gcy;&icy;&iecy; &vcy;&iecy;&shchcy;&icy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy; &ocy;&chcy;&iecy;&ncy;&softcy; &iecy;&scy;&tcy;&iecy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;:</span></p> <div> <ul> <li> <p><span data-i18n="b372a383b782c0117dfa14c700c0863a49e06ffe8612743837b98d75d4ffabe6/5f" data-source="To get the feature/bugfix into an integration branch, simply merge it. If the topic has evolved further in the meantime, merge again. (Note that you do not necessarily have to merge it to the oldest integration branch first. For example, you can first merge a bugfix to &lt;code&gt;next&lt;/code&gt;, give it some testing time, and merge to &lt;code&gt;maint&lt;/code&gt; when you know it is stable.)" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &dcy;&ocy;&bcy;&acy;&vcy;&icy;&tcy;&softcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yucy;/&icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &vcy; &vcy;&iecy;&tcy;&kcy;&ucy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &iecy;&iecy;. &IEcy;&scy;&lcy;&icy; &zcy;&acy; &ecy;&tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &tcy;&iecy;&mcy;&acy; &rcy;&acy;&zcy;&vcy;&icy;&lcy;&acy;&scy;&softcy; &dcy;&acy;&lcy;&softcy;&shcy;&iecy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy;&scy;&softcy; &iecy;&shchcy;&iecy; &rcy;&acy;&zcy;. (&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &vcy;&acy;&mcy; &ncy;&iecy; &ocy;&bcy;&yacy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &iecy;&gcy;&ocy; &scy; &scy;&acy;&mcy;&ocy;&jcy; &scy;&tcy;&acy;&rcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &scy;  <code>next</code>  , &dcy;&acy;&tcy;&softcy; &iecy;&mcy;&ucy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &vcy;&rcy;&iecy;&mcy;&yacy; &ncy;&acy; &tcy;&iecy;&scy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &iecy;&gcy;&ocy; &scy;  <code>maint</code> , &kcy;&ocy;&gcy;&dcy;&acy; &vcy;&ycy; &bcy;&ucy;&dcy;&iecy;&tcy;&iecy; &ucy;&vcy;&iecy;&rcy;&iecy;&ncy;&ycy;, &chcy;&tcy;&ocy; &ocy;&ncy;&ocy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ocy;.)</span></p> </li> <li> <p><span data-i18n="867402949e30470488968bf19eb043a3a0c932a5e6bd307a3bb86979bb3c9d3d/e1" data-source="If you find you need new features from the branch &lt;code&gt;other&lt;/code&gt; to continue working on your topic, merge &lt;code&gt;other&lt;/code&gt; to &lt;code&gt;topic&lt;/code&gt;. (However, do not do this &amp;quot;just habitually&amp;quot;, see below.)" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy; &vcy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ycy; &ncy;&ocy;&vcy;&ycy;&iecy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy; &icy;&zcy; &vcy;&iecy;&tcy;&kcy;&icy;  <code>other</code>  &dcy;&lcy;&yacy; &pcy;&rcy;&ocy;&dcy;&ocy;&lcy;&zhcy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&bcy;&ocy;&tcy;&ycy; &ncy;&acy;&dcy; &vcy;&acy;&shcy;&iecy;&jcy; &tcy;&iecy;&mcy;&ocy;&jcy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy;  <code>other</code>  &scy;  <code>topic</code> . (&Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&jcy;&tcy;&iecy; &ecy;&tcy;&ocy;&gcy;&ocy;  &quot;just habitually&quot; , &scy;&mcy;. &ncy;&icy;&zhcy;&iecy;.)</span></p> </li> <li> <p><span data-i18n="0adf605b32e78d7f5d4321e09ef508fac64e98ddf11d35635aaf5f9b4d659d04/2c" data-source="If you find you forked off the wrong branch and want to move it &amp;quot;back in time&amp;quot;, use &lt;a href=&quot;git-rebase&quot;&gt;git-rebase[1]&lt;/a&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy; &vcy;&ycy;&bcy;&rcy;&acy;&lcy;&icy; &ncy;&iecy; &tcy;&ucy; &vcy;&iecy;&tcy;&kcy;&ucy; &icy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&scy;&tcy;&icy;&tcy;&softcy; &iecy;&iecy;  &quot;back in time&quot; , &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <a href="git-rebase.html">git-rebase[1]</a>  .</span></p> </li> </ul> </div> <p><span data-i18n="c81e706803b92a34865dc85cc893ca4696cd3f71bac1545d38c1e40c5cc458cb/00" data-source="Note that the last point clashes with the other two: a topic that has been merged elsewhere should not be rebased. See the section on RECOVERING FROM UPSTREAM REBASE in &lt;a href=&quot;git-rebase&quot;&gt;git-rebase[1]&lt;/a&gt;." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&jcy; &pcy;&ucy;&ncy;&kcy;&tcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ocy;&rcy;&iecy;&chcy;&icy;&tcy; &dcy;&vcy;&ucy;&mcy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy;: &tcy;&iecy;&mcy;&ucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &bcy;&ycy;&lcy;&acy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&acy; &scy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy; &mcy;&iecy;&scy;&tcy;&ocy;&mcy;, &ncy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&bcy;&acy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;. &Scy;&mcy;. &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &laquo;&Vcy;&Ocy;&Scy;&Scy;&Tcy;&Acy;&Ncy;&Ocy;&Vcy;&Lcy;&IEcy;&Ncy;&Icy;&IEcy; &Icy;&Zcy; UpSTREAM REBASE&raquo; &vcy;  <a href="git-rebase.html">git-rebase[1]</a> .</span></p> <p><span data-i18n="09ceb78ac78d7008bd531204681ac09fb4fb1f07abcf553b115449268a280b87/24" data-source="We should point out that &amp;quot;habitually&amp;quot; (regularly for no real reason) merging an integration branch into your topics &amp;mdash; and by extension, merging anything upstream into anything downstream on a regular basis &amp;mdash; is frowned upon:" onmousemove="i18n(this)">&Mcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ocy;&tcy;&mcy;&iecy;&tcy;&icy;&tcy;&softcy;, &chcy;&tcy;&ocy;  &quot;habitually&quot;  (&rcy;&iecy;&gcy;&ucy;&lcy;&yacy;&rcy;&ncy;&ocy; &bcy;&iecy;&zcy; &kcy;&acy;&kcy;&ocy;&jcy;-&lcy;&icy;&bcy;&ocy; &rcy;&iecy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &pcy;&rcy;&icy;&chcy;&icy;&ncy;&ycy;) &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&tcy; &vcy;&iecy;&tcy;&kcy;&ucy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy; &scy; &vcy;&acy;&shcy;&icy;&mcy;&icy; &tcy;&iecy;&mcy;&acy;&mcy;&icy; - &icy;, &kcy;&acy;&kcy; &scy;&lcy;&iecy;&dcy;&scy;&tcy;&vcy;&icy;&iecy;, &rcy;&iecy;&gcy;&ucy;&lcy;&yacy;&rcy;&ncy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &chcy;&iecy;&gcy;&ocy;-&lcy;&icy;&bcy;&ocy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&gcy;&ocy; &pcy;&ocy;&tcy;&ocy;&kcy;&acy; &scy; &chcy;&iecy;&mcy;-&lcy;&icy;&bcy;&ocy; &ncy;&icy;&zhcy;&iecy;&scy;&tcy;&ocy;&yacy;&shchcy;&icy;&mcy; - &ncy;&iecy; &ocy;&dcy;&ocy;&bcy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy;:</span></p> <div> <div><span data-i18n="5e4fc15a544175238e9f892fc1a3e434a18823cd5cbb5a0a2784cb634b4dcd58/cc" data-source="Rule: Merge to downstream only at well-defined points" onmousemove="i18n(this)">&Pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;: &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&jcy;&tcy;&iecy;&scy;&softcy; &scy; &ncy;&icy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&mcy; &pcy;&ocy;&tcy;&ocy;&kcy;&ocy;&mcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy; &chcy;&iecy;&tcy;&kcy;&ocy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &tcy;&ocy;&chcy;&kcy;&acy;&khcy;.</span></div> <div> <p><span data-i18n="4121370f727696dad03037ecab5b4c1456dfb648db5d67a741716958032166cf/da" data-source="Do not merge to downstream except with a good reason: upstream API changes affect your branch; your branch no longer merges to upstream cleanly; etc." onmousemove="i18n(this)">&Ncy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&jcy;&tcy;&iecy;&scy;&softcy; &scy; &ncy;&icy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy;, &kcy;&rcy;&ocy;&mcy;&iecy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;&vcy;, &kcy;&ocy;&gcy;&dcy;&acy; &iecy;&scy;&tcy;&softcy; &vcy;&iecy;&scy;&kcy;&acy;&yacy; &pcy;&rcy;&icy;&chcy;&icy;&ncy;&acy;: &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; API &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy;&lcy;&icy;&yacy;&yucy;&tcy; &ncy;&acy; &vcy;&acy;&shcy;&ucy; &vcy;&iecy;&tcy;&kcy;&ucy;; &vcy;&acy;&shcy;&acy; &vcy;&iecy;&tcy;&kcy;&acy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy; &ncy;&iecy; &scy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy;; &icy; &tcy;. &dcy;.</span></p> </div> </div> <p><span data-i18n="11c151d2df7d65e3da76c38d28e217b1a681a117854f83465bbbbde8175ae73c/0f" data-source="Otherwise, the topic that was merged to suddenly contains more than a single (well-separated) change. The many resulting small merges will greatly clutter up history. Anyone who later investigates the history of a file will have to find out whether that merge affected the topic in development. An upstream might even inadvertently be merged into a &amp;quot;more stable&amp;quot; branch. And so on." onmousemove="i18n(this)">&Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &tcy;&iecy;&mcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &bcy;&ycy;&lcy;&acy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&acy;, &vcy;&ncy;&iecy;&zcy;&acy;&pcy;&ncy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; (&khcy;&ocy;&rcy;&ocy;&shcy;&ocy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy;) &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;. &Mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&shcy;&icy;&khcy; &vcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&iecy; &mcy;&iecy;&lcy;&kcy;&icy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy; &scy;&icy;&lcy;&softcy;&ncy;&ocy; &zcy;&acy;&scy;&ocy;&rcy;&yacy;&tcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy;. &Lcy;&yucy;&bcy;&ocy;&jcy;, &kcy;&tcy;&ocy; &pcy;&ocy;&zcy;&zhcy;&iecy; &icy;&scy;&scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy; &fcy;&acy;&jcy;&lcy;&acy;, &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&yacy;&scy;&ncy;&icy;&tcy;&softcy;, &pcy;&ocy;&vcy;&lcy;&icy;&yacy;&lcy;&ocy; &lcy;&icy; &ecy;&tcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&acy; &tcy;&iecy;&mcy;&ucy;, &ncy;&acy;&khcy;&ocy;&dcy;&yacy;&shchcy;&ucy;&yucy;&scy;&yacy; &vcy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&iecy;. &Vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&jcy; &kcy;&acy;&ncy;&acy;&lcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &dcy;&acy;&zhcy;&iecy; &scy;&lcy;&ucy;&chcy;&acy;&jcy;&ncy;&ocy; &bcy;&ycy;&tcy;&softcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy; &scy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy;  &quot;more stable&quot; . &Icy; &tcy;&acy;&kcy; &dcy;&acy;&lcy;&iecy;&iecy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_throw_away_integration"><span data-i18n="8ba9bce235997250e86677f05d281ea2b3c320e8360c642fcf0b05f67de726e5/50" data-source="Throw-away integration" onmousemove="i18n(this)">Throw-away integration</span></h3> <p><span data-i18n="6caad194fd7a5dbfbf045826830fb5dfe187fbd7d281ed04a558af88d69916aa/32" data-source="If you followed the last paragraph, you will now have many small topic branches, and occasionally wonder how they interact. Perhaps the result of merging them does not even work? But on the other hand, we want to avoid merging them anywhere &amp;quot;stable&amp;quot; because such merges cannot easily be undone." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&lcy;&icy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&iecy;&mcy;&ucy; &acy;&bcy;&zcy;&acy;&tscy;&ucy;, &ucy; &vcy;&acy;&scy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &bcy;&ucy;&dcy;&iecy;&tcy; &mcy;&ncy;&ocy;&gcy;&ocy; &ncy;&iecy;&bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &tcy;&iecy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &vcy;&iecy;&tcy;&ocy;&kcy;, &icy; &vcy;&ycy; &icy;&ncy;&ocy;&gcy;&dcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy;&iecy; &zcy;&acy;&dcy;&acy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy;&ocy;&pcy;&rcy;&ocy;&scy;&ocy;&mcy;, &kcy;&acy;&kcy; &ocy;&ncy;&icy; &vcy;&zcy;&acy;&icy;&mcy;&ocy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ucy;&yucy;&tcy;. &Vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &icy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&acy;&zhcy;&iecy; &ncy;&iecy; &scy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy;? &Ncy;&ocy; &scy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy;, &mcy;&ycy; &khcy;&ocy;&tcy;&icy;&mcy; &icy;&zcy;&bcy;&iecy;&zhcy;&acy;&tcy;&softcy; &icy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &gcy;&dcy;&iecy;-&lcy;&icy;&bcy;&ocy;,  &quot;stable&quot; , &pcy;&ocy;&tcy;&ocy;&mcy;&ucy; &chcy;&tcy;&ocy; &tcy;&acy;&kcy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; &lcy;&iecy;&gcy;&kcy;&ocy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;.</span></p> <p><span data-i18n="cf31593c2a0c1e6a454033ee7406d9325bcd92ef800f1467cc5e3e060a40be25/c2" data-source="The solution, of course, is to make a merge that we can undo: merge into a throw-away branch." onmousemove="i18n(this)">&Rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy;, &kcy;&ocy;&ncy;&iecy;&chcy;&ncy;&ocy;, &scy;&ocy;&scy;&tcy;&ocy;&icy;&tcy; &vcy; &tcy;&ocy;&mcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &mcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&mcy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;: &scy;&lcy;&icy;&tcy;&softcy; &vcy; &ocy;&dcy;&ncy;&ocy;&rcy;&acy;&zcy;&ocy;&vcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;.</span></p> <div> <div><span data-i18n="1d0b6b31f0a682e9e49cdbf209bddc6da2545be7dd44b471750eca97149aaebb/bc" data-source="Rule: Throw-away integration branches" onmousemove="i18n(this)">&Pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;: &vcy;&ycy;&bcy;&rcy;&acy;&scy;&ycy;&vcy;&acy;&tcy;&softcy; &vcy;&iecy;&tcy;&kcy;&icy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;</span></div> <div> <p><span data-i18n="6c595f65b5155455697a24a45e9586e80291a59e505fc4310da626fde7755719/b8" data-source="To test the interaction of several topics, merge them into a throw-away branch. You must never base any work on such a branch!" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&ocy;&tcy;&iecy;&scy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&zcy;&acy;&icy;&mcy;&ocy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&iecy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&icy;&khcy; &tcy;&iecy;&mcy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &icy;&khcy; &vcy; &ocy;&dcy;&ncy;&ocy;&rcy;&acy;&zcy;&ocy;&vcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;. &Vcy;&ycy; &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ocy;&scy;&ncy;&ocy;&vcy;&ycy;&vcy;&acy;&tcy;&softcy; &kcy;&acy;&kcy;&ucy;&yucy;-&lcy;&icy;&bcy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &ncy;&acy; &tcy;&acy;&kcy;&ocy;&jcy; &vcy;&iecy;&tcy;&vcy;&icy;!</span></p> </div> </div> <p><span data-i18n="2eb08ffd6e08d6fbb91ca6043e594ab69bc254f6d1b7d848f567ac0479561a48/a3" data-source="If you make it (very) clear that this branch is going to be deleted right after the testing, you can even publish this branch, for example to give the testers a chance to work with it, or other developers a chance to see if their in-progress work will be compatible. &lt;code&gt;git.git&lt;/code&gt; has such an official throw-away integration branch called &lt;code&gt;seen&lt;/code&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; (&ocy;&chcy;&iecy;&ncy;&softcy;) &yacy;&scy;&ncy;&ocy; &dcy;&acy;&dcy;&icy;&tcy;&iecy; &pcy;&ocy;&ncy;&yacy;&tcy;&softcy;, &chcy;&tcy;&ocy; &ecy;&tcy;&acy; &vcy;&iecy;&tcy;&kcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&acy; &scy;&rcy;&acy;&zcy;&ucy; &pcy;&ocy;&scy;&lcy;&iecy; &tcy;&iecy;&scy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &vcy;&ycy; &dcy;&acy;&zhcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ocy;&pcy;&ucy;&bcy;&lcy;&icy;&kcy;&ocy;&vcy;&acy;&tcy;&softcy; &ecy;&tcy;&ucy; &vcy;&iecy;&tcy;&kcy;&ucy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &dcy;&acy;&tcy;&softcy; &tcy;&iecy;&scy;&tcy;&icy;&rcy;&ocy;&vcy;&shchcy;&icy;&kcy;&acy;&mcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &pcy;&ocy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&tcy;&softcy; &scy; &ncy;&iecy;&jcy; &icy;&lcy;&icy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&chcy;&icy;&kcy;&acy;&mcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &ucy;&vcy;&icy;&dcy;&iecy;&tcy;&softcy;, &ncy;&iecy;&zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&ncy;&acy;&yacy; &rcy;&acy;&bcy;&ocy;&tcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&acy;. &Ucy;  <code>git.git</code>  &iecy;&scy;&tcy;&softcy; &tcy;&acy;&kcy;&acy;&yacy; &ocy;&fcy;&icy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&acy;&yacy; &ocy;&dcy;&ncy;&ocy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&yacy; &vcy;&iecy;&tcy;&kcy;&acy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy; &pcy;&ocy;&dcy; &ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&iecy;&mcy;  <code>seen</code> .</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_branch_management_for_a_release"><span data-i18n="5e05d62b9e3a7073b07f9748a680313fb9648f1a8c07997d89c0974078e38e22/3c" data-source="Branch management for a release" onmousemove="i18n(this)">&Rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&ocy; &fcy;&icy;&lcy;&icy;&acy;&lcy;&ocy;&mcy; &dcy;&lcy;&yacy; &rcy;&iecy;&lcy;&icy;&zcy;&acy;</span></h3> <p><span data-i18n="cac22261bae27e2af46722b83bc051c6745e2948a92063d35c43c1fe4d5c5847/7e" data-source="Assuming you are using the merge approach discussed above, when you are releasing your project you will need to do some additional branch management work." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&yacy;, &chcy;&tcy;&ocy; &vcy;&ycy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&iecy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy;&ycy;&shcy;&iecy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &pcy;&rcy;&icy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&iecy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy; &vcy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ucy;&yucy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &pcy;&ocy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yucy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy;.</span></p> <p><span data-i18n="bc4ea5f16cdfa1c732a90485c5966d314f74c2501d9558ee9bf310b1b31a9113/28" data-source="A feature release is created from the &lt;code&gt;master&lt;/code&gt; branch, since &lt;code&gt;master&lt;/code&gt; tracks the commits that should go into the next feature release." onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ucy;&scy;&kcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy; &ocy;&scy;&ncy;&ocy;&vcy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy;  <code>master</code> , &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy;  <code>master</code>  &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &vcy;&ocy;&jcy;&tcy;&icy; &vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy;.</span></p> <p><span data-i18n="5dea6bc7fc5fa11896b051921dd9f593ca630158e71b83e97558ebc17792e97b/40" data-source="The &lt;code&gt;master&lt;/code&gt; branch is supposed to be a superset of &lt;code&gt;maint&lt;/code&gt;. If this condition does not hold, then &lt;code&gt;maint&lt;/code&gt; contains some commits that are not included on &lt;code&gt;master&lt;/code&gt;. The fixes represented by those commits will therefore not be included in your feature release." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &vcy;&iecy;&tcy;&kcy;&acy;  <code>master</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &ncy;&acy;&dcy;&mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy;&mcy;  <code>maint</code> . &IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &ucy;&scy;&lcy;&ocy;&vcy;&icy;&iecy; &ncy;&iecy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy;, &tcy;&ocy;  <code>maint</code>  &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &ncy;&iecy;&tcy; &vcy;  <code>master</code> . &Pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &ecy;&tcy;&icy;&mcy;&icy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&mcy;&icy;, &ncy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ycy; &vcy; &vcy;&acy;&shcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&jcy;.</span></p> <p><span data-i18n="41a6d93f1554cfeaf4ebe018f70f6ad72395ded98386f1325d31a05301a9622c/fe" data-source="To verify that &lt;code&gt;master&lt;/code&gt; is indeed a superset of &lt;code&gt;maint&lt;/code&gt;, use git log:" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &ucy;&bcy;&iecy;&dcy;&icy;&tcy;&softcy;&scy;&yacy;, &chcy;&tcy;&ocy;  <code>master</code>  &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ncy;&acy;&dcy;&mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy;&mcy;  <code>maint</code> , &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;  git :</span></p> <div> <div><span data-i18n="1efe295c78a81858019efe8061b2b405fd78975c535f1ad0621701333c8163c8/a9" data-source="Recipe: Verify &lt;em&gt;master&lt;/em&gt; is a superset of &lt;em&gt;maint&lt;/em&gt;" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: &ucy;&bcy;&iecy;&dcy;&icy;&tcy;&iecy;&scy;&softcy;, &chcy;&tcy;&ocy; master &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &rcy;&acy;&scy;&shcy;&icy;&rcy;&iecy;&ncy;&ncy;&ycy;&mcy; &ncy;&acy;&bcy;&ocy;&rcy;&ocy;&mcy; maint.</span>
</div> <div> <p><code>git log master..maint</code></p> </div> </div> <p><span data-i18n="8ebee1f62911506b70609b796e1b07abf83b2f6a43fa211214bbc437416a8082/22" data-source="This command should not list any commits. Otherwise, check out &lt;code&gt;master&lt;/code&gt; and merge &lt;code&gt;maint&lt;/code&gt; into it." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&acy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&tcy;&softcy; &kcy;&acy;&kcy;&icy;&iecy;-&lcy;&icy;&bcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;. &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&softcy;&tcy;&iecy;  <code>master</code>  &icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &scy; &ncy;&icy;&mcy;  <code>maint</code> .</span></p> <p><span data-i18n="c2c572caedaa36d8a72d3cf51ecfeef369a181a2e8c88bc59dfdc83b78246f75/5b" data-source="Now you can proceed with the creation of the feature release. Apply a tag to the tip of &lt;code&gt;master&lt;/code&gt; indicating the release version:" onmousemove="i18n(this)">&Tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&rcy;&icy;&scy;&tcy;&ucy;&pcy;&icy;&tcy;&softcy; &kcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yucy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&ocy;&ncy;&acy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &rcy;&iecy;&lcy;&icy;&zcy;&acy;. &Pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&tcy;&iecy; &kcy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy;&ucy;  <code>master</code>  &mcy;&iecy;&tcy;&kcy;&ucy; &scy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy;&mcy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;:</span></p> <div> <div><span data-i18n="9290d966192efbff0f52a5384de680d0b7713920004f6f08403e78916bccd6ee/45" data-source="Recipe: Release tagging" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: &Ocy;&tcy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy; &mcy;&iecy;&tcy;&kcy;&ucy;</span></div> <div> <p><code>git tag -s -m &quot;Git X.Y.Z&quot; vX.Y.Z master</code></p> </div> </div> <p><span data-i18n="a33b34f6337dcf20812c40e29925ee089b1ed6928552a8be159c9acdea835c89/84" data-source="You need to push the new tag to a public Git server (see &amp;quot;DISTRIBUTED WORKFLOWS&amp;quot; below). This makes the tag available to others tracking your project. The push could also trigger a post-update hook to perform release-related items such as building release tarballs and preformatted documentation pages." onmousemove="i18n(this)">&Vcy;&acy;&mcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &ncy;&ocy;&vcy;&ycy;&jcy; &tcy;&iecy;&gcy; &ncy;&acy; &scy;&iecy;&rcy;&vcy;&iecy;&rcy;  public   Git  (&scy;&mcy;.  &quot;DISTRIBUTED WORKFLOWS&quot;  &ncy;&icy;&zhcy;&iecy;). &Ecy;&tcy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&iecy;&tcy; &tcy;&iecy;&gcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&mcy; &dcy;&lcy;&yacy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy;, &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&yucy;&shchcy;&icy;&khcy; &vcy;&acy;&shcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;. &Ecy;&tcy;&ocy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ycy;&zcy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&khcy;&vcy;&acy;&tcy;&chcy;&icy;&kcy; &pcy;&ocy;&scy;&lcy;&iecy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy;, &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&khcy; &scy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy;, &tcy;&acy;&kcy;&icy;&khcy; &kcy;&acy;&kcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&iecy; &acy;&rcy;&khcy;&icy;&vcy;&ocy;&vcy; &rcy;&iecy;&lcy;&icy;&zcy;&acy; &icy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ocy;&tcy;&fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy;.</span></p> <p><span data-i18n="5cfc8e6b5f084da39bab3c06bb0d85c3a9df02e3e4f3f5e26de59fed3ffac9f4/f8" data-source="Similarly, for a maintenance release, &lt;code&gt;maint&lt;/code&gt; is tracking the commits to be released. Therefore, in the steps above simply tag and push &lt;code&gt;maint&lt;/code&gt; rather than &lt;code&gt;master&lt;/code&gt;." onmousemove="i18n(this)">&Acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&ncy;&ocy;, &dcy;&lcy;&yacy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy;  <code>maint</code>  &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &vcy;&ycy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ycy;. &Pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &ncy;&acy; &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&ncy;&ncy;&ycy;&khcy; &vcy;&ycy;&shcy;&iecy; &shcy;&acy;&gcy;&acy;&khcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &pcy;&ocy;&mcy;&iecy;&tcy;&softcy;&tcy;&iecy; &icy; &ncy;&acy;&zhcy;&mcy;&icy;&tcy;&iecy;  <code>maint</code> , &acy; &ncy;&iecy;  <code>master</code> .</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_maintenance_branch_management_after_a_feature_release"><span data-i18n="8c15117604db255de7cd306c8ea7817cbc3010ddab38eeb4c4c912426489e565/41" data-source="Maintenance branch management after a feature release" onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy;</span></h3> <p><span data-i18n="3f92a74a53955e7d5bd1c80937864f9fb76642ee05684f92039b1c2eb7adc5f6/af" data-source="After a feature release, you need to manage your maintenance branches." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy; &vcy;&acy;&mcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&tcy;&softcy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="784421fce5317fcedcaf67bfdf4d5798b50296b260373922e9fc6685dadb4152/dd" data-source="First, if you wish to continue to release maintenance fixes for the feature release made before the recent one, then you must create another branch to track commits for that previous release." onmousemove="i18n(this)">&Vcy;&ocy;-&pcy;&iecy;&rcy;&vcy;&ycy;&khcy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&rcy;&ocy;&dcy;&ocy;&lcy;&zhcy;&acy;&tcy;&softcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;&tcy;&softcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&jcy;, &vcy;&ycy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &dcy;&ocy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&iecy;&gcy;&ocy;, &vcy;&acy;&mcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&tcy;&softcy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy; &dcy;&lcy;&yacy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;.</span></p> <p><span data-i18n="776b3de881f0b088bd218c65576a8a7246c3fb750f7190f122876bb561101a30/e7" data-source="To do this, the current maintenance branch is copied to another branch named with the previous release version number (e.g. maint-X.Y.(Z-1) where X.Y.Z is the current release)." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &tcy;&iecy;&kcy;&ucy;&shchcy;&acy;&yacy; &vcy;&iecy;&tcy;&kcy;&acy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&ocy;&pcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;, &ncy;&acy;&zcy;&vcy;&acy;&ncy;&ncy;&ucy;&yucy; &pcy;&ocy; &ncy;&ocy;&mcy;&iecy;&rcy;&ucy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, maint-XY(Z-1), &gcy;&dcy;&iecy; XYZ &mdash; &tcy;&iecy;&kcy;&ucy;&shchcy;&icy;&jcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;).</span></p> <div> <div><span data-i18n="4203b3ad125f5ec5b7f03f6ae2de36e45537b86d7045c6d58dbab418370e1fcd/dc" data-source="Recipe: Copy maint" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: &Kcy;&ocy;&pcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &mcy;&iecy;&jcy;&ncy;&tcy;</span></div> <div> <p><code>git branch maint-X.Y.(Z-1) maint</code></p> </div> </div> <p><span data-i18n="34fe4d6bda1f8febdb8b8bf91afc22c6085541c25bbda7978640568c15595511/05" data-source="The &lt;code&gt;maint&lt;/code&gt; branch should now be fast-forwarded to the newly released code so that maintenance fixes can be tracked for the current release:" onmousemove="i18n(this)">&Tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &vcy;&iecy;&tcy;&kcy;&ucy;  <code>maint</code>  &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &bcy;&ycy;&scy;&tcy;&rcy;&ocy; &pcy;&iecy;&rcy;&iecy;&jcy;&tcy;&icy; &kcy; &ncy;&iecy;&dcy;&acy;&vcy;&ncy;&ocy; &vcy;&ycy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ncy;&ocy;&mcy;&ucy; &kcy;&ocy;&dcy;&ucy;, &chcy;&tcy;&ocy;&bcy;&ycy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;:</span></p> <div> <div><span data-i18n="2e454acd6e149cbb486b081367e384f36b4fa6fc921b834f255ea9422b946a34/e5" data-source="Recipe: Update maint to new release" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; maint &dcy;&ocy; &ncy;&ocy;&vcy;&ocy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;.</span></div> <div> <div> <ul> <li> <p><code>git checkout maint</code></p> </li> <li> <p><code>git merge --ff-only master</code></p> </li> </ul> </div> </div> </div> <p><span data-i18n="1b961b4f3de84c64ac2473894934e35065237728e7e135d6837871b3a5d141f7/8a" data-source="If the merge fails because it is not a fast-forward, then it is possible some fixes on &lt;code&gt;maint&lt;/code&gt; were missed in the feature release. This will not happen if the content of the branches was verified as described in the previous section." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&iecy; &ucy;&dcy;&acy;&lcy;&ocy;&scy;&softcy; &icy;&zcy;-&zcy;&acy; &tcy;&ocy;&gcy;&ocy;, &chcy;&tcy;&ocy; &ocy;&ncy;&ocy; &ncy;&iecy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&ocy;&jcy; &vcy;&pcy;&iecy;&rcy;&iecy;&dcy;, &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;  <code>maint</code>  &bcy;&ycy;&lcy;&icy; &pcy;&rcy;&ocy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ycy; &vcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&iecy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy;. &Ecy;&tcy;&ocy;&gcy;&ocy; &ncy;&iecy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&jcy;&dcy;&iecy;&tcy;, &iecy;&scy;&lcy;&icy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &bcy;&ycy;&lcy;&ocy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&iecy;&ncy;&ocy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_branch_management_for_next_and_seen_after_a_feature_release"><span data-i18n="36c6d344c49bf7ffce5146f06ef4dcde87cb61bd1c81d4135a7dd07f505216ef/f2" data-source="Branch management for next and seen after a feature release" onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy; &dcy;&lcy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&khcy; &icy; &vcy;&icy;&dcy;&icy;&mcy;&ycy;&khcy; &pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&jcy;</span></h3> <p><span data-i18n="4cb7aa68a383e73ae0056e3358018e2ebe8746bf3408ecdcc80f6f51fab72d85/18" data-source="After a feature release, the integration branch &lt;code&gt;next&lt;/code&gt; may optionally be rewound and rebuilt from the tip of &lt;code&gt;master&lt;/code&gt; using the surviving topics on &lt;code&gt;next&lt;/code&gt;:" onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &rcy;&iecy;&lcy;&icy;&zcy;&acy; &fcy;&icy;&chcy;&icy; &vcy;&iecy;&tcy;&kcy;&acy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;  <code>next</code>  &pcy;&rcy;&icy; &zhcy;&iecy;&lcy;&acy;&ncy;&icy;&icy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&acy;&ncy;&acy; &icy; &pcy;&iecy;&rcy;&iecy;&scy;&ocy;&bcy;&rcy;&acy;&ncy;&acy; &icy;&zcy; &vcy;&iecy;&rcy;&khcy;&ucy;&shcy;&kcy;&icy;  <code>master</code> , &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&vcy;&shcy;&icy;&iecy;&scy;&yacy; &tcy;&iecy;&mcy;&ycy; &pcy;&ocy;  <code>next</code> :</span></p> <div> <div><span data-i18n="74a8bf21dbfd0493f8cf9fc01675cc4cce4ea88135bdefb8a5d9730c9e4dfcf5/c6" data-source="Recipe: Rewind and rebuild next" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: &Pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&acy; &ncy;&acy;&zcy;&acy;&dcy; &icy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy;.</span></div> <div> <div> <ul> <li> <p><code>git switch -C next master</code></p> </li> <li> <p><code>git merge ai/topic_in_next1</code></p> </li> <li> <p><code>git merge ai/topic_in_next2</code></p> </li> <li> <p><span data-i18n="8fb68c0ab3cb45f341dc314d14234f5b15e8e7e8fef30338cb13a5837e221d93/3e" data-source="&amp;hellip;&amp;ZeroWidthSpace;" onmousemove="i18n(this)">&hellip;&ZeroWidthSpace;</span></p> </li> </ul> </div> </div> </div> <p><span data-i18n="f23c532cead0c81c409ad8c3296d6636d0029a9fe2e71dd0ff8f8e7da0a47a2a/26" data-source="The advantage of doing this is that the history of &lt;code&gt;next&lt;/code&gt; will be clean. For example, some topics merged into &lt;code&gt;next&lt;/code&gt; may have initially looked promising, but were later found to be undesirable or premature. In such a case, the topic is reverted out of &lt;code&gt;next&lt;/code&gt; but the fact remains in the history that it was once merged and reverted. By recreating &lt;code&gt;next&lt;/code&gt;, you give another incarnation of such topics a clean slate to retry, and a feature release is a good point in history to do so." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&icy;&mcy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &vcy; &tcy;&ocy;&mcy;, &chcy;&tcy;&ocy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy;  <code>next</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &chcy;&icy;&scy;&tcy;&ocy;&jcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &tcy;&iecy;&mcy;&ycy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy;  <code>next</code> , &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &icy;&zcy;&ncy;&acy;&chcy;&acy;&lcy;&softcy;&ncy;&ocy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&iecy;&lcy;&icy; &mcy;&ncy;&ocy;&gcy;&ocy;&ocy;&bcy;&iecy;&shchcy;&acy;&yucy;&shchcy;&iecy;, &ncy;&ocy; &pcy;&ocy;&zcy;&zhcy;&iecy; &bcy;&ycy;&lcy;&icy; &pcy;&rcy;&icy;&zcy;&ncy;&acy;&ncy;&ycy; &ncy;&iecy;&zhcy;&iecy;&lcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy;&icy; &icy;&lcy;&icy; &pcy;&rcy;&iecy;&zhcy;&dcy;&iecy;&vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy;. &Vcy; &tcy;&acy;&kcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &tcy;&iecy;&mcy;&acy; &ocy;&tcy;&kcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &icy;&zcy;  <code>next</code>  &ncy;&ocy; &fcy;&acy;&kcy;&tcy; &ocy;&scy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;, &chcy;&tcy;&ocy; &kcy;&ocy;&gcy;&dcy;&acy;-&tcy;&ocy; &iecy;&iecy; &scy;&lcy;&icy;&lcy;&icy; &icy; &ocy;&tcy;&kcy;&acy;&tcy;&icy;&lcy;&icy;. &Vcy;&ocy;&scy;&scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&yacy;  <code>next</code> , &vcy;&ycy; &dcy;&acy;&iecy;&tcy;&iecy; &iecy;&shchcy;&iecy; &ocy;&dcy;&ncy;&ocy;&mcy;&ucy; &vcy;&ocy;&pcy;&lcy;&ocy;&shchcy;&iecy;&ncy;&icy;&yucy; &tcy;&acy;&kcy;&icy;&khcy; &tcy;&iecy;&mcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&icy;&tcy;&softcy; &pcy;&ocy;&pcy;&ycy;&tcy;&kcy;&ucy;, &acy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy; &ncy;&ocy;&vcy;&ocy;&jcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy; &mdash; &khcy;&ocy;&rcy;&ocy;&shcy;&icy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&jcy; &mcy;&ocy;&mcy;&iecy;&ncy;&tcy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy;.</span></p> <p><span data-i18n="58cce560b851e7a27f0d7e092fb328a382cb517c025bd3dc211ad3e3b074116c/6a" data-source="If you do this, then you should make a public announcement indicating that &lt;code&gt;next&lt;/code&gt; was rewound and rebuilt." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ecy;&tcy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&iecy;&tcy;&iecy;, &tcy;&ocy; &ucy; &vcy;&acy;&scy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &pcy;&ocy;&yacy;&vcy;&icy;&tcy;&softcy;&scy;&yacy; &ocy;&bcy;&hardcy;&yacy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;  public  &ocy; &tcy;&ocy;&mcy;, &chcy;&tcy;&ocy;  <code>next</code>  &bcy;&ycy;&lcy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&acy;&ncy; &icy; &pcy;&iecy;&rcy;&iecy;&scy;&ocy;&bcy;&rcy;&acy;&ncy;.</span></p> <p><span data-i18n="fcbcbf9081d99fc8df97cabc22ed57e625e0b60adf13d0c598db72e2e27e68e2/d7" data-source="The same rewind and rebuild process may be followed for &lt;code&gt;seen&lt;/code&gt;. A public announcement is not necessary since &lt;code&gt;seen&lt;/code&gt; is a throw-away branch, as described above." onmousemove="i18n(this)">&Tcy;&ocy;&tcy; &zhcy;&iecy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&icy; &icy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &dcy;&lcy;&yacy;  <code>seen</code> . &Ocy;&bcy;&hardcy;&yacy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;  public  &ncy;&iecy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy;  <code>seen</code>  &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ocy;&dcy;&ncy;&ocy;&rcy;&acy;&zcy;&ocy;&vcy;&ocy;&jcy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy;&ycy;&shcy;&iecy;.</span></p> </div> </div> <h2 class="text-body-emphasis"  id="_distributed_workflows"><span data-i18n="141b390aa8c04a512ad334d4fbee608bd38d2e20a5c1cd2087e98e94a22337ff/58" data-source="Distributed workflows" onmousemove="i18n(this)">Distributed workflows</span></h2> <div> <p><span data-i18n="172f27d17860c9b8841a6629470f7a31bbd711679129f055ca3b959a4836b6ab/54" data-source="After the last section, you should know how to manage topics. In general, you will not be the only person working on the project, so you will have to share your work." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&iecy;&gcy;&ocy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy; &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &zcy;&ncy;&acy;&tcy;&softcy;, &kcy;&acy;&kcy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&tcy;&softcy; &tcy;&iecy;&mcy;&acy;&mcy;&icy;. &Vcy; &ocy;&bcy;&shchcy;&iecy;&mcy;, &vcy;&ycy; &bcy;&ucy;&dcy;&iecy;&tcy;&iecy; &ncy;&iecy; &iecy;&dcy;&icy;&ncy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&mcy; &chcy;&iecy;&lcy;&ocy;&vcy;&iecy;&kcy;&ocy;&mcy;, &rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&icy;&mcy; &ncy;&acy;&dcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&ocy;&mcy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &vcy;&acy;&mcy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;&scy;&yacy; &scy;&vcy;&ocy;&iecy;&jcy; &rcy;&acy;&bcy;&ocy;&tcy;&ocy;&jcy;.</span></p> <p><span data-i18n="f4562e3bf3dc23ae9e29741a0b64456668aed070bf914e85e2508cace528f384/06" data-source="Roughly speaking, there are two important workflows: merge and patch. The important difference is that the merge workflow can propagate full history, including merges, while patches cannot. Both workflows can be used in parallel: in &lt;code&gt;git.git&lt;/code&gt;, only subsystem maintainers use the merge workflow, while everyone else sends patches." onmousemove="i18n(this)">&Gcy;&rcy;&ucy;&bcy;&ocy; &gcy;&ocy;&vcy;&ocy;&rcy;&yacy;, &iecy;&scy;&tcy;&softcy; &dcy;&vcy;&acy; &vcy;&acy;&zhcy;&ncy;&ycy;&khcy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&khcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&acy;: &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;. &Vcy;&acy;&zhcy;&ncy;&ycy;&mcy; &ocy;&tcy;&lcy;&icy;&chcy;&icy;&iecy;&mcy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &tcy;&ocy;, &chcy;&tcy;&ocy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &rcy;&acy;&scy;&pcy;&rcy;&ocy;&scy;&tcy;&rcy;&acy;&ncy;&yacy;&tcy;&softcy; &pcy;&ocy;&lcy;&ncy;&ucy;&yucy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy;, &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &acy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &mdash; &ncy;&iecy;&tcy;. &Ocy;&bcy;&acy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&khcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&acy; &mcy;&ocy;&gcy;&ucy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&acy;&rcy;&acy;&lcy;&lcy;&iecy;&lcy;&softcy;&ncy;&ocy;: &vcy;  <code>git.git</code>  &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&icy;&scy;&tcy;&ycy; &pcy;&ocy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&iecy;&ncy;&icy;&yucy; &pcy;&ocy;&dcy;&scy;&icy;&scy;&tcy;&iecy;&mcy;&ycy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yucy;&tcy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy; &tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&acy;&kcy; &vcy;&scy;&iecy; &ocy;&scy;&tcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&yucy;&tcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="db8517bfb382ebd739a64379fc27f64ff1b2aa599c1e63b9b14e7b9586aeceb3/bb" data-source="Note that the maintainer(s) may impose restrictions, such as &amp;quot;Signed-off-by&amp;quot; requirements, that all commits/patches submitted for inclusion must adhere to. Consult your project&amp;rsquo;s documentation for more information." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&icy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &ncy;&acy;&lcy;&acy;&gcy;&acy;&tcy;&softcy; &ocy;&gcy;&rcy;&acy;&ncy;&icy;&chcy;&iecy;&ncy;&icy;&yacy;, &tcy;&acy;&kcy;&icy;&iecy; &kcy;&acy;&kcy; &tcy;&rcy;&iecy;&bcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;  &quot;Signed-off-by&quot; , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy;/&icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &dcy;&lcy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy;. &Dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy;&scy;&softcy; &kcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy; &vcy;&acy;&shcy;&iecy;&gcy;&ocy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy;.</span></p> <div> <h3 class="text-body-emphasis"  id="_merge_workflow"><span data-i18n="e9f713da51980ae5b9cedbe0fceae8e87a14cf06db0c2077935a33ea1a42ff91/20" data-source="Merge workflow" onmousemove="i18n(this)">Merge workflow</span></h3> <p><span data-i18n="7d0a679163d60b0a86ce06774601dc3c916a8288c73ed26f9f7acf945749f2ab/0a" data-source="The merge workflow works by copying branches between upstream and downstream. Upstream can merge contributions into the official history; downstream base their work on the official history." onmousemove="i18n(this)">&Rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy; &pcy;&ucy;&tcy;&iecy;&mcy; &kcy;&ocy;&pcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &mcy;&iecy;&zhcy;&dcy;&ucy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&mcy; &icy; &ncy;&icy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&mcy; &pcy;&ocy;&tcy;&ocy;&kcy;&ocy;&mcy;. Upstream &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&tcy;&softcy; &vcy;&kcy;&lcy;&acy;&dcy;&ycy; &vcy; &ocy;&fcy;&icy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yucy;; &ncy;&icy;&zhcy;&iecy; &pcy;&ocy; &tcy;&iecy;&chcy;&iecy;&ncy;&icy;&yucy; &ocy;&scy;&ncy;&ocy;&vcy;&ycy;&vcy;&acy;&yucy;&tcy; &scy;&vcy;&ocy;&yucy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &ncy;&acy; &ocy;&fcy;&icy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;.</span></p> <p><span data-i18n="c089752ee9dfbb827c9f87b83fce2cabbeb64e9079279e450f1175de04b5d9e8/88" data-source="There are three main tools that can be used for this:" onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &tcy;&rcy;&icy; &ocy;&scy;&ncy;&ocy;&vcy;&ncy;&ycy;&khcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;:</span></p> <div> <ul> <li> <p><span data-i18n="dd8ad32eecc42ce6c4a4515f660a00ddaf0b500c79fbf7f0f40dcbf0875dbb37/ed" data-source="&lt;a href=&quot;git-push&quot;&gt;git-push[1]&lt;/a&gt; copies your branches to a remote repository, usually to one that can be read by all involved parties;" onmousemove="i18n(this)"><a href="git-push.html">git-push[1]</a>  &kcy;&ocy;&pcy;&icy;&rcy;&ucy;&iecy;&tcy; &vcy;&acy;&shcy;&icy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;, &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &vcy; &tcy;&ocy;&tcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&ocy;&chcy;&icy;&tcy;&acy;&ncy; &vcy;&scy;&iecy;&mcy;&icy; &ucy;&chcy;&acy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy;&mcy;&icy;;</span></p> </li> <li> <p><span data-i18n="9a2e40b7ae8745d3d1ed6527e9abe00c7b9c83afaf4f84996115368d263c3f5e/46" data-source="&lt;a href=&quot;git-fetch&quot;&gt;git-fetch[1]&lt;/a&gt; that copies remote branches to your repository; and" onmousemove="i18n(this)"><a href="git-fetch.html">git-fetch[1]</a> , &kcy;&ocy;&pcy;&icy;&rcy;&ucy;&yucy;&shchcy;&icy;&jcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &vcy;&acy;&shcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;; &icy;</span></p> </li> <li> <p><span data-i18n="82a1f558edf200dba1ceb81b988550a94bb4ff0dab94c74cfa801658af9430bf/60" data-source="&lt;a href=&quot;git-pull&quot;&gt;git-pull[1]&lt;/a&gt; that does fetch and merge in one go." onmousemove="i18n(this)"><a href="git-pull.html">git-pull[1]</a> , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&zcy;&vcy;&lcy;&iecy;&kcy;&acy;&iecy;&tcy; &icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&tcy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &zcy;&acy; &ocy;&dcy;&icy;&ncy; &rcy;&acy;&zcy;.</span></p> </li> </ul> </div> <p><span data-i18n="088b0c2dd612903714f017c61dcedcd4d7ad9271fba37fc93fa5ad7d91859b4c/1d" data-source="Note the last point. Do &lt;code&gt;not&lt;/code&gt; use &lt;code&gt;git pull&lt;/code&gt; unless you actually want to merge the remote branch." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy; &ncy;&acy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&jcy; &pcy;&ucy;&ncy;&kcy;&tcy;. &Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>not</code> <code>git pull</code> , &iecy;&scy;&lcy;&icy; &vcy;&ycy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ncy;&iecy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;.</span></p> <p><span data-i18n="4db897b439c2005a3f3de79f7c8c4cdb5c8f60bafe7bf3dc10db0fde9111117f/97" data-source="Getting changes out is easy:" onmousemove="i18n(this)">&Vcy;&ncy;&iecy;&scy;&tcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &lcy;&iecy;&gcy;&kcy;&ocy;:</span></p> <div> <div><span data-i18n="8b0a73b400303135e0f4233e405b92e34823db775d34dcb078f761effaf63c21/28" data-source="Recipe: Push/pull: Publishing branches/topics" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: Push/pull: &Pcy;&ucy;&bcy;&lcy;&icy;&kcy;&acy;&tscy;&icy;&yacy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;/&tcy;&iecy;&mcy;.</span></div> <div> <p><span data-i18n="98399dff7899c55a170ccf26dc4cef769b00ceb985d1784c0e83b653bd6f9f17/32" data-source="&lt;code&gt;git push &amp;lt;remote&amp;gt; &amp;lt;branch&amp;gt;&lt;/code&gt; and tell everyone where they can fetch from." onmousemove="i18n(this)"><code>git push &lt;remote&gt; &lt;branch&gt;</code>  &icy; &scy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &vcy;&scy;&iecy;&mcy;, &ocy;&tcy;&kcy;&ucy;&dcy;&acy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&zcy;&yacy;&tcy;&softcy;.</span></p> </div> </div> <p><span data-i18n="dda2f71e9a822e416d1ef91b083c7cb7218668e46786491e3a20a688f03c328d/b8" data-source="You will still have to tell people by other means, such as mail. (Git provides the &lt;a href=&quot;git-request-pull&quot;&gt;git-request-pull[1]&lt;/a&gt; to send preformatted pull requests to upstream maintainers to simplify this task.)" onmousemove="i18n(this)">&Vcy;&acy;&mcy; &vcy;&scy;&iecy; &rcy;&acy;&vcy;&ncy;&ocy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&tcy;&softcy; &lcy;&yucy;&dcy;&yacy;&mcy; &ocy;&bcy; &ecy;&tcy;&ocy;&mcy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy;&icy; &scy;&pcy;&ocy;&scy;&ocy;&bcy;&acy;&mcy;&icy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy; &pcy;&ocy; &pcy;&ocy;&chcy;&tcy;&iecy;. (Git &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;  <a href="git-request-pull.html">git-request-pull[1]</a>  &dcy;&lcy;&yacy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&kcy;&icy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ocy;&tcy;&fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &zcy;&acy;&pcy;&rcy;&ocy;&scy;&ocy;&vcy; &ncy;&acy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy; &vcy;&ycy;&shcy;&iecy;&scy;&tcy;&ocy;&yacy;&shchcy;&icy;&mcy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&chcy;&icy;&kcy;&acy;&mcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&pcy;&rcy;&ocy;&scy;&tcy;&icy;&tcy;&softcy; &ecy;&tcy;&ucy; &zcy;&acy;&dcy;&acy;&chcy;&ucy;.)</span></p> <p><span data-i18n="7bebcd6e305108e02943c077c51c41ced1ab5b509e9bf89ea922f7c3758ab0c0/1d" data-source="If you just want to get the newest copies of the integration branches, staying up to date is easy too:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&acy;&tcy;&softcy; &ncy;&ocy;&vcy;&iecy;&jcy;&shcy;&icy;&iecy; &kcy;&ocy;&pcy;&icy;&icy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &ocy;&scy;&tcy;&acy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy; &kcy;&ucy;&rcy;&scy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&khcy; &scy;&ocy;&bcy;&ycy;&tcy;&icy;&jcy; &tcy;&ocy;&zhcy;&iecy; &lcy;&iecy;&gcy;&kcy;&ocy;:</span></p> <div> <div><span data-i18n="5af272ba48772f7f05f9ed56dd4a9a85bb466654bf93b21a9412db3a55eb0f12/08" data-source="Recipe: Push/pull: Staying up to date" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: Push/Pull: &bcy;&ycy;&tcy;&softcy; &vcy; &kcy;&ucy;&rcy;&scy;&iecy; &scy;&ocy;&bcy;&ycy;&tcy;&icy;&jcy;.</span></div> <div> <p><span data-i18n="8b65dc82f82b80fd02d6091d472a7f92b9235cf5b5a702587f9d89e0d4d284ba/c3" data-source="Use &lt;code&gt;git fetch &amp;lt;remote&amp;gt;&lt;/code&gt; or &lt;code&gt;git remote update&lt;/code&gt; to stay up to date." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>git fetch &lt;remote&gt;</code>  &icy;&lcy;&icy;  <code>git remote update</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&scy;&tcy;&acy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy; &kcy;&ucy;&rcy;&scy;&iecy; &scy;&ocy;&bcy;&ycy;&tcy;&icy;&jcy;.</span></p> </div> </div> <p><span data-i18n="64ab3e9651b738eb3da608064faf2a0b9103000f78a97307548c57d35e2387cb/02" data-source="Then simply fork your topic branches from the stable remotes as explained earlier." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &tcy;&iecy;&mcy; &icy;&zcy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ycy;&khcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&jcy;, &kcy;&acy;&kcy; &ocy;&bcy;&hardcy;&yacy;&scy;&ncy;&yacy;&lcy;&ocy;&scy;&softcy; &rcy;&acy;&ncy;&iecy;&iecy;.</span></p> <p><span data-i18n="1398ec7979ade08130ae9361b5bda681965164498faa9307a9ef3f824ae56bd2/9a" data-source="If you are a maintainer and would like to merge other people&amp;rsquo;s topic branches to the integration branches, they will typically send a request to do so by mail. Such a request looks like" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&iecy;&scy;&softcy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&icy;&scy;&tcy;&ocy;&mcy; &pcy;&ocy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&iecy;&ncy;&icy;&yucy; &icy; &khcy;&ocy;&tcy;&iecy;&lcy;&icy; &bcy;&ycy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &tcy;&iecy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &lcy;&yucy;&dcy;&iecy;&jcy; &scy; &vcy;&iecy;&tcy;&kcy;&acy;&mcy;&icy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &ocy;&ncy;&icy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&yacy;&tcy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &ncy;&acy; &ecy;&tcy;&ocy; &pcy;&ocy; &pcy;&ocy;&chcy;&tcy;&iecy;. &Tcy;&acy;&kcy;&ocy;&jcy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&icy;&tcy;</span></p> <div> <div> <pre class="hljs language-xml">Please pull from
    <span class="hljs-tag">&lt;<span class="hljs-name">URL</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">branch</span>&gt;</span></pre> </div> </div> <p><span data-i18n="f32a67865f7e1a546df92e771f86fcf0fcd16d1c688fef163f62d55f34a3dba7/31" data-source="In that case, &lt;code&gt;git pull&lt;/code&gt; can do the fetch and merge in one go, as follows." onmousemove="i18n(this)">&Vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;  <code>git pull</code>  &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &vcy;&ycy;&bcy;&ocy;&rcy;&kcy;&ucy; &icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &zcy;&acy; &ocy;&dcy;&icy;&ncy; &rcy;&acy;&zcy;, &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;.</span></p> <div> <div><span data-i18n="79641564d59719a96f0293e4d56eb96612cf7b36fca53a0db8e781239373ae8d/fe" data-source="Recipe: Push/pull: Merging remote topics" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: Push/Pull: &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &tcy;&iecy;&mcy;</span></div> <div> <p><code>git pull &lt;URL&gt; &lt;branch&gt;</code></p> </div> </div> <p><span data-i18n="b2d597c9230cad401b8122183883de3b649dbc8fcc0b0fa73516a35996536d5d/25" data-source="Occasionally, the maintainer may get merge conflicts when they try to pull changes from downstream. In this case, they can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will know better how to resolve them). It is one of the rare cases where downstream &lt;code&gt;should&lt;/code&gt; merge from upstream." onmousemove="i18n(this)">&Icy;&ncy;&ocy;&gcy;&dcy;&acy; &ucy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&iecy;&gcy;&ocy; &mcy;&ocy;&gcy;&ucy;&tcy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&ncy;&ucy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&gcy;&dcy;&acy; &ocy;&ncy; &pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &ncy;&icy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&gcy;&ocy; &pcy;&ocy;&tcy;&ocy;&kcy;&acy;. &Vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ocy;&ncy;&icy; &mcy;&ocy;&gcy;&ucy;&tcy; &pcy;&ocy;&pcy;&rcy;&ocy;&scy;&icy;&tcy;&softcy; &ncy;&icy;&zhcy;&iecy;&scy;&tcy;&ocy;&yacy;&shchcy;&icy;&khcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy; &scy;&acy;&mcy;&ocy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; (&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &ocy;&ncy;&icy; &bcy;&ucy;&dcy;&ucy;&tcy; &lcy;&ucy;&chcy;&shcy;&iecy; &zcy;&ncy;&acy;&tcy;&softcy;, &kcy;&acy;&kcy; &icy;&khcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&tcy;&softcy;). &Ecy;&tcy;&ocy; &ocy;&dcy;&icy;&ncy; &icy;&zcy; &rcy;&iecy;&dcy;&kcy;&icy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;&vcy;, &kcy;&ocy;&gcy;&dcy;&acy; &ncy;&icy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&jcy;  <code>should</code>  &scy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&mcy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="_patch_workflow"><span data-i18n="3f60df1973346e093beacb612115386344a1e67c59486ee0faf26ada6f5e6df2/69" data-source="Patch workflow" onmousemove="i18n(this)">Patch workflow</span></h3> <p><span data-i18n="e5fa6948b9297889f2158ba039725732011fda02891a29dcd66b26aabbcfc6cc/ad" data-source="If you are a contributor that sends changes upstream in the form of emails, you should use topic branches as usual (see above). Then use &lt;a href=&quot;git-format-patch&quot;&gt;git-format-patch[1]&lt;/a&gt; to generate the corresponding emails (highly recommended over manually formatting them because it makes the maintainer&amp;rsquo;s life easier)." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&iecy;&scy;&softcy; &ucy;&chcy;&acy;&scy;&tcy;&ncy;&icy;&kcy;&ocy;&mcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy; &vcy;&icy;&dcy;&iecy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ycy;&khcy; &pcy;&icy;&scy;&iecy;&mcy;, &vcy;&acy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&iecy;&tcy;&kcy;&icy; &tcy;&iecy;&mcy;, &kcy;&acy;&kcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; (&scy;&mcy;. &vcy;&ycy;&shcy;&iecy;). &Zcy;&acy;&tcy;&iecy;&mcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <a href="git-format-patch.html">git-format-patch[1]</a>  &dcy;&lcy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&khcy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ycy;&khcy; &pcy;&icy;&scy;&iecy;&mcy; (&ncy;&acy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&khcy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &ecy;&tcy;&ocy; &ocy;&bcy;&lcy;&iecy;&gcy;&chcy;&acy;&iecy;&tcy; &zhcy;&icy;&zcy;&ncy;&softcy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&iecy;&mcy;&ucy;).</span></p> <div> <div><span data-i18n="dd7698f374a93608d9d9765d7dd89bcf704e572d68a001a452052ef8061130d1/70" data-source="Recipe: format-patch/am: Publishing branches/topics" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: format-patch/am: &Pcy;&ucy;&bcy;&lcy;&icy;&kcy;&acy;&tscy;&icy;&yacy; &vcy;&iecy;&tcy;&ocy;&kcy;/&tcy;&iecy;&mcy;</span></div> <div> <div> <ul> <li> <p><span data-i18n="ff847633e198a329e54ee53f5ecef3c0351bd8ee312f2fe986ccd26ef0ca4f6b/42" data-source="&lt;code&gt;git format-patch -M upstream..topic&lt;/code&gt; to turn them into preformatted patch files" onmousemove="i18n(this)"><code>git format-patch -M upstream..topic</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&iecy;&vcy;&rcy;&acy;&tcy;&icy;&tcy;&softcy; &icy;&khcy; &vcy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ocy;&tcy;&fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&jcy;.</span></p> </li> <li> <p><code>git send-email --to=&lt;recipient&gt; &lt;patches&gt;</code></p> </li> </ul> </div> </div> </div> <p><span data-i18n="2af688783b07baeaefa6b5dbce77e410109717dd098bd910fe1901fd84180ebe/f9" data-source="See the &lt;a href=&quot;git-format-patch&quot;&gt;git-format-patch[1]&lt;/a&gt; and &lt;a href=&quot;git-send-email&quot;&gt;git-send-email[1]&lt;/a&gt; manpages for further usage notes." onmousemove="i18n(this)">&Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&yacy; &pcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yucy; &scy;&mcy;. &ncy;&acy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy;&acy;&khcy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy;  <a href="git-format-patch.html">git-format-patch[1]</a>  &icy;  <a href="git-send-email.html">git-send-email[1]</a> .</span></p> <p><span data-i18n="1e97eb2a6da8d692c9b2f21af01af3fc06868daba0d1754c44942979e2f2dffe/dc" data-source="If the maintainer tells you that your patch no longer applies to the current upstream, you will have to rebase your topic (you cannot use a merge because you cannot format-patch merges):" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&icy;&jcy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&iecy;&tcy; &vcy;&acy;&mcy;, &chcy;&tcy;&ocy; &vcy;&acy;&shcy; &pcy;&acy;&tcy;&chcy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy; &ncy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &kcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&mcy;&ucy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&mcy;&ucy; &kcy;&ocy;&dcy;&ucy;, &vcy;&acy;&mcy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&bcy;&acy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&acy;&shcy;&ucy; &tcy;&iecy;&mcy;&ucy; (&vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &pcy;&ocy;&tcy;&ocy;&mcy;&ucy; &chcy;&tcy;&ocy; &vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&tcy;&softcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &pcy;&acy;&tcy;&chcy;&iecy;&jcy;):</span></p> <div> <div><span data-i18n="dc3a04dabb14b4a6cc36ad9dd5f6c0a3048e4680492e0bb5f81b03bbf192ff5a/38" data-source="Recipe: format-patch/am: Keeping topics up to date" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: format-patch/am: &Pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&icy;&iecy; &tcy;&iecy;&mcy; &vcy; &acy;&kcy;&tcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy;&mcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&icy;.</span></div> <div> <p><code>git pull --rebase &lt;URL&gt; &lt;branch&gt;</code></p> </div> </div> <p><span data-i18n="2ae1069bc5a5a8efaf04d6d272c1f50c0152aa907c4f00282aea22421e9f9a86/c3" data-source="You can then fix the conflicts during the rebase. Presumably you have not published your topic other than by mail, so rebasing it is not a problem." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &pcy;&iecy;&rcy;&iecy;&bcy;&acy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &Pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&ocy;&zhcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &vcy;&ycy; &ncy;&iecy; &pcy;&ucy;&bcy;&lcy;&icy;&kcy;&ocy;&vcy;&acy;&lcy;&icy; &scy;&vcy;&ocy;&yucy; &tcy;&iecy;&mcy;&ucy; &kcy;&rcy;&ocy;&mcy;&iecy; &kcy;&acy;&kcy; &pcy;&ocy; &pcy;&ocy;&chcy;&tcy;&iecy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &pcy;&iecy;&rcy;&iecy;&bcy;&acy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &iecy;&iecy; &ncy;&iecy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&acy;.</span></p> <p><span data-i18n="26efb220f968b26514a95eef6e662b688125a2bae13b4074d500f5aceba0fd72/94" data-source="If you receive such a patch series (as maintainer, or perhaps as a reader of the mailing list it was sent to), save the mails to files, create a new topic branch and use &lt;code&gt;git am&lt;/code&gt; to import the commits:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&lcy;&icy; &tcy;&acy;&kcy;&ucy;&yucy; &ZeroWidthSpace;&ZeroWidthSpace;&scy;&iecy;&rcy;&icy;&yucy; &pcy;&acy;&tcy;&chcy;&iecy;&jcy; (&kcy;&acy;&kcy; &scy;&ocy;&pcy;&rcy;&ocy;&vcy;&ocy;&zhcy;&dcy;&acy;&yucy;&shchcy;&icy;&jcy; &icy;&lcy;&icy;, &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &kcy;&acy;&kcy; &chcy;&icy;&tcy;&acy;&tcy;&iecy;&lcy;&softcy; &scy;&pcy;&icy;&scy;&kcy;&acy; &rcy;&acy;&scy;&scy;&ycy;&lcy;&kcy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy;&ucy; &ocy;&ncy;&acy; &bcy;&ycy;&lcy;&acy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&acy;), &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&iecy; &pcy;&icy;&scy;&softcy;&mcy;&acy; &vcy; &fcy;&acy;&jcy;&lcy;&ycy;, &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &ncy;&ocy;&vcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy; &tcy;&iecy;&mcy;&ycy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>git am</code>  &dcy;&lcy;&yacy; &icy;&mcy;&pcy;&ocy;&rcy;&tcy;&acy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;:</span></p> <div> <div><span data-i18n="99adebfac83cca85aeb9cdea216b73e75a442434ebe77e141c14b2d330d5168b/99" data-source="Recipe: format-patch/am: Importing patches" onmousemove="i18n(this)">&Rcy;&iecy;&tscy;&iecy;&pcy;&tcy;: format-patch/am: &Icy;&mcy;&pcy;&ocy;&rcy;&tcy; &pcy;&acy;&tcy;&chcy;&iecy;&jcy;</span></div> <div> <p><code>git am &lt; patch</code></p> </div> </div> <p><span data-i18n="da8639759c79188b218df1d8dc95af1f714f6e65de7c95bb979314728c064a35/47" data-source="One feature worth pointing out is the three-way merge, which can help if you get conflicts: &lt;code&gt;git am -3&lt;/code&gt; will use index information contained in patches to figure out the merge base. See &lt;a href=&quot;git-am&quot;&gt;git-am[1]&lt;/a&gt; for other options." onmousemove="i18n(this)">&Scy;&tcy;&ocy;&icy;&tcy; &ocy;&tcy;&mcy;&iecy;&tcy;&icy;&tcy;&softcy; &ocy;&dcy;&ncy;&ucy; &ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy;&scy;&tcy;&softcy; &mdash; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&ocy;&mcy;&ocy;&chcy;&softcy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&ncy;&ocy;&vcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;:  <code>git am -3</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&ucy;&yucy;&scy;&yacy; &vcy; &pcy;&acy;&tcy;&chcy;&acy;&khcy;, &dcy;&lcy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &bcy;&acy;&zcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Dcy;&rcy;&ucy;&gcy;&icy;&iecy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ycy; &scy;&mcy;. &vcy;  <a href="git-am.html">git-am[1]</a> .</span></p> </div> </div> <h2 class="text-body-emphasis"  id="_see_also"><span data-i18n="2fa97693b70fa87b95b2d1bdf9558e4ac65d5e82d145f13a03849c4d9c4957a9/40" data-source="See also" onmousemove="i18n(this)">See also</span></h2> <div> <p><span data-i18n="fc9cbb1a1ff9ec8e0a16af44499c5a10641ae111f21d044f3ba12d9289c8ed35/b5" data-source="&lt;a href=&quot;gittutorial&quot;&gt;gittutorial[7]&lt;/a&gt;, &lt;a href=&quot;git-push&quot;&gt;git-push[1]&lt;/a&gt;, &lt;a href=&quot;git-pull&quot;&gt;git-pull[1]&lt;/a&gt;, &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt;, &lt;a href=&quot;git-rebase&quot;&gt;git-rebase[1]&lt;/a&gt;, &lt;a href=&quot;git-format-patch&quot;&gt;git-format-patch[1]&lt;/a&gt;, &lt;a href=&quot;git-send-email&quot;&gt;git-send-email[1]&lt;/a&gt;, &lt;a href=&quot;git-am&quot;&gt;git-am[1]&lt;/a&gt;" onmousemove="i18n(this)"><a href="gittutorial.html">gittutorial[7]</a> ,  <a href="git-push.html">git-push[1]</a> ,  <a href="git-pull.html">git-pull[1]</a> ,  <a href="git-merge.html">git-merge[1]</a> ,  <a href="git-rebase.html">git-rebase[1]</a> ,  <a href="git-format-patch.html">git-format-patch[1]</a> ,  <a href="git-send-email.html">git-send-email[1]</a> ,  <a href="git-am.html">git-am[1]</a></span></p> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/gitworkflows">https://git-scm.com/docs/gitworkflows</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                               <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="howto-index.html">
                            howto index                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="multi-pack-index.html">
                            multi pack-index                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="partial-clone.html">
                            partial clone                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="scalar.html">
                            scalar                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="user-manual.html">
                            User Manual                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="gitworkflows.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>